package com.git.demo;

public class GitConflictDemo {
	public static String name = "aaa";
	public static String sex = "male";
	public static String other = "...";

	public static String getName( ) {
		return name;
	}

	public static void setName( String name ) {
		GitConflictDemo.name = name;
	}

	public static String getSex( ) {
		return sex;
	}

	public static void setSex( String sex ) {
		GitConflictDemo.sex = sex;
	}

	public static String getOther( ) {
		return other;
	}

	public static void setOther( String other ) {
		GitConflictDemo.other = other;
	}


}
